solidus_admin 0.1.0 → 0.3.0

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

data/app/controllers/solidus_admin/users_controller.rb

@@ -3,12 +3,15 @@
 module SolidusAdmin
   class UsersController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
+    include Spree::Core::ControllerHelpers::StrongParameters
 
-    search_scope(:customers, default: true) { _1.left_outer_joins(:role_users).where(role_users: { id: nil }) }
+    before_action :set_user, only: [:edit, :addresses, :update_addresses, :orders, :items]
+
+    search_scope(:all, default: true)
+    search_scope(:customers) { _1.left_outer_joins(:role_users).where(role_users: { id: nil }) }
     search_scope(:admin) { _1.joins(:role_users).distinct }
     search_scope(:with_orders) { _1.joins(:orders).distinct }
     search_scope(:without_orders) { _1.left_outer_joins(:orders).where(orders: { id: nil }) }
-    search_scope(:all)
 
     def index
       users = apply_search_to(
@@ -23,6 +26,52 @@ module SolidusAdmin
       end
     end
 
+    def addresses
+      respond_to do |format|
+        format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+        format.html { render component('users/addresses').new(user: @user) }
+      end
+    end
+
+    def update_addresses
+      set_address_from_params
+
+      if @address.valid? && @user.update(user_params)
+        flash[:success] = t(".#{@type}.success")
+
+        respond_to do |format|
+          format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+          format.html { render component('users/addresses').new(user: @user) }
+        end
+      else
+        respond_to do |format|
+          format.html { render component('users/addresses').new(user: @user, address: @address, type: @type), status: :unprocessable_entity }
+        end
+      end
+    end
+
+    def orders
+      set_orders
+
+      respond_to do |format|
+        format.html { render component('users/orders').new(user: @user, orders: @orders) }
+      end
+    end
+
+    def items
+      set_items
+
+      respond_to do |format|
+        format.html { render component('users/items').new(user: @user, items: @items) }
+      end
+    end
+
+    def edit
+      respond_to do |format|
+        format.html { render component('users/edit').new(user: @user) }
+      end
+    end
+
     def destroy
       @users = Spree.user_class.where(id: params[:id])
 
@@ -34,13 +83,43 @@ module SolidusAdmin
 
     private
 
-    def load_user
-      @user = Spree.user_class.find_by!(number: params[:id])
-      authorize! action_name, @user
+    def set_user
+      @user = Spree.user_class.find(params[:id])
     end
 
     def user_params
-      params.require(:user).permit(:user_id, permitted_user_attributes)
+      params.require(:user).permit(
+        :user_id,
+        permitted_user_attributes,
+        bill_address_attributes: permitted_address_attributes,
+        ship_address_attributes: permitted_address_attributes
+      )
+    end
+
+    # @note This method is used to generate validation errors on the address.
+    #   Since the update is being performed via the @user, and not directly on
+    #   the @address, we sadly don't seem to get these errors automatically.
+    def set_address_from_params
+      if user_params.key?(:bill_address_attributes)
+        @address = Spree::Address.new(user_params[:bill_address_attributes])
+        @type = "bill"
+      elsif user_params.key?(:ship_address_attributes)
+        @address = Spree::Address.new(user_params[:ship_address_attributes])
+        @type = "ship"
+      end
+    end
+
+    def set_orders
+      params[:q] ||= {}
+      @search = Spree::Order.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
+      @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+    end
+
+    def set_items
+      params[:q] ||= {}
+      @search = Spree::Order.reverse_chronological.includes(line_items: { variant: [:product, { option_values: :option_type }] }).ransack(params[:q].merge(user_id_eq: @user.id))
+      @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+      @items = @orders&.map(&:line_items)&.flatten
     end
 
     def authorization_subject

data/app/controllers/solidus_admin/zones_controller.rb

@@ -28,11 +28,6 @@ module SolidusAdmin
 
     private
 
-    def load_zone
-      @zone = Spree::Zone.find_by!(number: params[:id])
-      authorize! action_name, @zone
-    end
-
     def zone_params
       params.require(:zone).permit(:zone_id, permitted_zone_attributes)
     end

data/app/helpers/solidus_admin/last_login_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module SolidusAdmin
+  module LastLoginHelper
+    def last_login(user)
+      return t('solidus_admin.users.last_login.never') if user.try(:last_sign_in_at).blank?
+
+      t(
+        'solidus_admin.users.last_login.login_time_ago',
+        # @note The second `.try` is here for the specs and for setups that use a
+        # custom User class which may not have this attribute.
+        last_login_time: time_ago_in_words(user.try(:last_sign_in_at))
+      ).capitalize
+    end
+  end
+end

data/app/helpers/solidus_admin/permission_sets_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module SolidusAdmin
+  module PermissionSetsHelper
+    # @param permission_sets [Array<Spree::PermissionSet>] an array of
+    #   PermissionSet objects to be organized into categories based on their
+    #   names.
+    # @param view_label [String] A string of your choice associated with "View"
+    #   or "Display" level permissions. Used when rendering the checkbox.
+    # @param edit_label [String] A string of your choice associated with "Edit"
+    #   or "Management" level permissions. Used when rendering the checkbox.
+    def organize_permissions(permission_sets:, view_label:, edit_label:)
+      return {} if permission_sets.blank?
+
+      permission_sets.each_with_object({}) do |permission, grouped_permissions|
+        group_key = permission.category.to_sym
+
+        case permission.privilege
+        when "display"
+          grouped_permissions[group_key] ||= []
+          grouped_permissions[group_key] << { label: view_label, id: permission.id }
+        when "management"
+          grouped_permissions[group_key] ||= []
+          grouped_permissions[group_key] << { label: edit_label, id: permission.id }
+        else
+          grouped_permissions[:other] ||= []
+          grouped_permissions[:other] << { label: permission.name, id: permission.id }
+        end
+      end
+    end
+  end
+end

data/app/views/layouts/solidus_admin/application.html.erb

@@ -11,6 +11,7 @@
     <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_light_theme]), media: '(prefers-color-scheme: light)', "data-turbo-track": "reload" %>
     <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_dark_theme]), media: '(prefers-color-scheme: dark)', "data-turbo-track": "reload" %>
     <%= javascript_importmap_tags "solidus_admin/application", shim: false, importmap: SolidusAdmin.importmap %>
+    <meta name="turbo-refresh-scroll", content="preserve">
   </head>
 
   <body class="bg-gray-15 font-sans">
@@ -29,7 +30,7 @@
 
     <div class="fixed inset-x-0 bottom-3 flex items-center justify-center flex-col gap-3 pointer-events-none" role="alert">
       <% flash.each do |key, message| %>
-        <%= render component("ui/toast").new(text: message, scheme: key == :error ? :error : :default) %>
+        <%= render component("ui/toast").new(text: message, scheme: key.to_sym == :error ? :error : :default) %>
       <% end %>
     </div>
   </body>

data/app/views/layouts/solidus_admin/preview.html.erb

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_light_theme]), media: '(prefers-color-scheme: light)', "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_dark_theme]), media: '(prefers-color-scheme: dark)', "data-turbo-track": "reload" %>
     <%= javascript_importmap_tags "solidus_admin/application", shim: false, importmap: SolidusAdmin.importmap %>
   </head>
   <body class="p-3">

data/config/initializers/view_component.rb

@@ -10,7 +10,7 @@ if Rails.env.development? || Rails.env.test?
   clear = "\e[0m"
 
   ActiveSupport::Notifications.subscribe("render.view_component") do |*args|
-    next unless args.last[:name].starts_with?("SolidusAdmin::")
+    next unless args.last[:name]&.starts_with?("SolidusAdmin::")
 
     event = ActiveSupport::Notifications::Event.new(*args)
     SolidusAdmin::BaseComponent.logger.debug \

data/config/locales/adjustment_reasons.en.yml

@@ -3,4 +3,8 @@ en:
     adjustment_reasons:
       title: "Adjustment Reasons"
       destroy:
-        success: "Adjustment Reasons were successfully removed."
+        success: "Adjustment reasons were successfully removed."
+      create:
+        success: "Adjustment reason was successfully created."
+      update:
+        success: "Adjustment reason was successfully updated."

data/config/locales/adjustments.en.yml

@@ -0,0 +1,10 @@
+en:
+  solidus_admin:
+    adjustments:
+      title: "Adjustments"
+      lock:
+        success: "Locked successfully"
+      unlock:
+        success: "Unlocked successfully"
+      destroy:
+        success: "Deleted successfully"