solidus_admin 0.2.0 → 0.3.1

data/app/components/solidus_admin/users/orders/component.html.erb

@@ -0,0 +1,42 @@
+<%= page do %>
+  <%= page_header do %>
+    <%= page_header_back(solidus_admin.users_path) %>
+    <%= page_header_title(t(".title", email: @user.email)) %>
+
+    <%= page_header_actions do %>
+      <%= render component("ui/button").new(tag: :a, text: t(".create_order_for_user"), href: spree.new_admin_order_path(user_id: @user.id)) %>
+    <% end %>
+  <% end %>
+
+  <%= page_header do %>
+    <% tabs.each do |tab| %>
+      <%= render(component("ui/button").new(tag: :a, scheme: :ghost, text: tab[:text], 'aria-current': tab[:current], href: tab[:href])) %>
+    <% end %>
+  <% end %>
+
+  <%= page_with_sidebar do %>
+    <%= page_with_sidebar_main do %>
+      <%= render component('ui/panel').new(title: t(".order_history")) do %>
+        <% if @orders.present? %>
+          <%= render component('ui/table').new(
+              id: stimulus_id,
+              data: {
+                class: model_class,
+                rows: rows,
+                fade: -> { row_fade(_1) },
+                columns: columns,
+                url: -> { row_url(_1) },
+              },
+          )%>
+        <% else %>
+            <%= t(".no_orders_found") %>
+            <%= render component("ui/button").new(tag: :a, text: t(".create_one"), href: spree.new_admin_order_path(user_id: @user.id)) %>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <%= page_with_sidebar_aside do %>
+      <%= render component("users/stats").new(user: @user) %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/users/orders/component.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::Orders::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  def initialize(user:, orders:)
+    @user = user
+    @orders = orders
+  end
+
+  def tabs
+    [
+      {
+        text: t('.account'),
+        href: solidus_admin.user_path(@user),
+        current: false,
+      },
+      {
+        text: t('.addresses'),
+        href: solidus_admin.addresses_user_path(@user),
+        current: false,
+      },
+      {
+        text: t('.order_history'),
+        href: solidus_admin.orders_user_path(@user),
+        current: true,
+      },
+      {
+        text: t('.items'),
+        href: spree.items_admin_user_path(@user),
+        current: false,
+      },
+      {
+        text: t('.store_credit'),
+        href: spree.admin_user_store_credits_path(@user),
+        current: false,
+      },
+    ]
+  end
+
+  def model_class
+    Spree::Order
+  end
+
+  def row_url(order)
+    spree.edit_admin_order_path(order)
+  end
+
+  def rows
+    @orders
+  end
+
+  def row_fade(_order)
+    false
+  end
+
+  def columns
+    [
+      number_column,
+      state_column,
+      date_column,
+      payment_column,
+      shipment_column,
+      total_column,
+    ]
+  end
+
+  def number_column
+    {
+      header: :order,
+      data: ->(order) do
+        if !row_fade(order)
+          content_tag :div, order.number, class: 'font-semibold'
+        else
+          content_tag :div, order.number
+        end
+      end
+    }
+  end
+
+  def state_column
+    {
+      header: :state,
+      data: ->(order) do
+        color = {
+          'complete' => :green,
+          'returned' => :red,
+          'canceled' => :blue,
+          'cart' => :graphite_light,
+        }[order.state] || :yellow
+        component('ui/badge').new(name: order.state.humanize, color: color)
+      end
+    }
+  end
+
+  def date_column
+    {
+      header: :date,
+      data: ->(order) do
+        content_tag :div, l(order.created_at, format: :short)
+      end
+    }
+  end
+
+  def total_column
+    {
+      header: :total,
+      data: ->(order) do
+        content_tag :div, number_to_currency(order.total)
+      end
+    }
+  end
+
+  def payment_column
+    {
+      header: :payment,
+      data: ->(order) do
+        component('ui/badge').new(name: order.payment_state.humanize, color: order.paid? ? :green : :yellow) if order.payment_state?
+      end
+    }
+  end
+
+  def shipment_column
+    {
+      header: :shipment,
+      data: ->(order) do
+        component('ui/badge').new(name: order.shipment_state.humanize, color: order.shipped? ? :green : :yellow) if order.shipment_state?
+      end
+    }
+  end
+end

data/app/components/solidus_admin/users/orders/component.yml

@@ -0,0 +1,12 @@
+en:
+  title: "Users / %{email} / Order History"
+  account: Account
+  addresses: Addresses
+  order_history: Order History
+  items: Items
+  store_credit: Store Credit
+  last_active: Last Active
+  create_order_for_user: Create order for this user
+  no_orders_found: No Orders found.
+  create_one: Create One
+  back: Back

data/app/components/solidus_admin/users/stats/component.html.erb

@@ -0,0 +1,11 @@
+<%= render component("ui/panel").new(title: t("spree.lifetime_stats")) do %>
+  <%= render component("ui/details_list").new(
+    items: [
+      { label: t("spree.total_sales"), value: @user.display_lifetime_value.to_html },
+      { label: t("spree.order_count"), value: @user.order_count.to_i },
+      { label: t("spree.average_order_value"), value: @user.display_average_order_value.to_html },
+      { label: t("spree.member_since"), value: @user.created_at.to_date },
+      { label: t(".last_active"), value: last_login(@user) },
+    ]
+  ) %>
+<% end %>

data/app/components/solidus_admin/users/stats/component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::Stats::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::LastLoginHelper
+
+  def initialize(user:)
+    @user = user
+  end
+end

data/app/components/solidus_admin/users/stats/component.yml

@@ -0,0 +1,2 @@
+en:
+  last_active: Last Active

data/app/components/solidus_admin/users_and_roles/component.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::UsersAndRoles::Component < SolidusAdmin::UI::Pages::Index::Component
+  def title
+    page_header_title safe_join([
+      tag.div(t(".title")),
+    ])
+  end
+
+  def tabs
+    [
+      {
+        text: Spree.user_class.model_name.human(count: 2),
+        href: solidus_admin.users_path,
+        current: model_class == Spree.user_class,
+      },
+      {
+        text: Spree::Role.model_name.human(count: 2),
+        href: solidus_admin.roles_path,
+        current: model_class == Spree::Role,
+      },
+    ]
+  end
+end

data/app/components/solidus_admin/users_and_roles/component.yml

@@ -0,0 +1,2 @@
+en:
+  title: "Users and Roles"

data/app/components/solidus_admin/zones/index/component.rb

@@ -30,7 +30,7 @@ class SolidusAdmin::Zones::Index::Component < SolidusAdmin::UI::Pages::Index::Co
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.zones_path,
         method: :delete,
         icon: 'delete-bin-7-line',

data/app/controllers/solidus_admin/addresses_controller.rb

@@ -26,7 +26,12 @@ module SolidusAdmin
 
     def update
       if @order.contents.update_cart(order_params)
-        redirect_to order_path(@order), status: :see_other, notice: t('.success')
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html { redirect_to order_path(@order), status: :see_other }
+          format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+        end
       else
         flash.now[:error] = @order.errors[:base].join(", ") if @order.errors[:base].any?
 

data/app/controllers/solidus_admin/adjustment_reasons_controller.rb

@@ -4,19 +4,86 @@ module SolidusAdmin
   class AdjustmentReasonsController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
 
-    def index
-      adjustment_reasons = apply_search_to(
-        Spree::AdjustmentReason.order(id: :desc),
-        param: :q,
-      )
+    before_action :set_adjustment_reason, only: %i[edit update]
 
-      set_page_and_extract_portion_from(adjustment_reasons)
+    def index
+      set_index_page
 
       respond_to do |format|
         format.html { render component('adjustment_reasons/index').new(page: @page) }
       end
     end
 
+    def new
+      @adjustment_reason = Spree::AdjustmentReason.new
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('adjustment_reasons/new').new(page: @page, adjustment_reason: @adjustment_reason) }
+      end
+    end
+
+    def create
+      @adjustment_reason = Spree::AdjustmentReason.new(adjustment_reason_params)
+
+      if @adjustment_reason.save
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.adjustment_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('adjustment_reasons/new').new(page: @page, adjustment_reason: @adjustment_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def edit
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('adjustment_reasons/edit').new(page: @page, adjustment_reason: @adjustment_reason) }
+      end
+    end
+
+    def update
+      if @adjustment_reason.update(adjustment_reason_params)
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.adjustment_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('adjustment_reasons/edit').new(page: @page, adjustment_reason: @adjustment_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
     def destroy
       @adjustment_reason = Spree::AdjustmentReason.find_by!(id: params[:id])
 
@@ -28,13 +95,21 @@ module SolidusAdmin
 
     private
 
-    def load_adjustment_reason
-      @adjustment_reason = Spree::AdjustmentReason.find_by!(id: params[:id])
-      authorize! action_name, @adjustment_reason
+    def set_adjustment_reason
+      @adjustment_reason = Spree::AdjustmentReason.find(params[:id])
     end
 
     def adjustment_reason_params
-      params.require(:adjustment_reason).permit(:adjustment_reason_id, permitted_adjustment_reason_attributes)
+      params.require(:adjustment_reason).permit(:name, :code, :active)
+    end
+
+    def set_index_page
+      adjustment_reasons = apply_search_to(
+        Spree::AdjustmentReason.order(id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(adjustment_reasons)
     end
   end
 end

data/app/controllers/solidus_admin/adjustments_controller.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::AdjustmentsController < SolidusAdmin::BaseController
+  before_action :load_order
+
+  def index
+    load_adjustments
+    set_page_and_extract_portion_from(@adjustments)
+
+    respond_to do |format|
+      format.html do
+        render component('orders/show/adjustments/index').new(
+          order: @order,
+          adjustments: @adjustments,
+        )
+      end
+    end
+  end
+
+  def lock
+    @adjustments = @order.all_adjustments.not_finalized.where(id: params[:id])
+    @adjustments.each(&:finalize!)
+    flash[:success] = t('.success')
+
+    redirect_to order_adjustments_path(@order), status: :see_other
+  end
+
+  def unlock
+    @adjustments = @order.all_adjustments.finalized.where(id: params[:id])
+    @adjustments.each(&:unfinalize!)
+    flash[:success] = t('.success')
+
+    redirect_to order_adjustments_path(@order), status: :see_other
+  end
+
+  def destroy
+    @adjustments = @order.all_adjustments.where(id: params[:id])
+    @adjustments.destroy_all
+    flash[:success] = t('.success')
+
+    redirect_to order_adjustments_path(@order), status: :see_other
+  end
+
+  private
+
+  def load_adjustments
+    @adjustments = @order
+      .all_adjustments
+      .order("adjustable_type ASC, created_at ASC")
+      .ransack(params[:q])
+      .result
+  end
+
+  def load_order
+    @order = Spree::Order.find_by!(number: params[:order_id])
+  end
+end

data/app/controllers/solidus_admin/customers_controller.rb

@@ -4,7 +4,11 @@ class SolidusAdmin::CustomersController < SolidusAdmin::BaseController
   before_action :load_order, only: [:show, :destroy]
 
   def show
-    render component('orders/show/email').new(order: @order)
+    respond_to do |format|
+      format.html do
+        render component('orders/show/email').new(order: @order)
+      end
+    end
   end
 
   def destroy

data/app/controllers/solidus_admin/orders_controller.rb

@@ -54,7 +54,11 @@ module SolidusAdmin
         flash[:error] = t('.error')
       end
 
-      redirect_to spree.edit_admin_order_path(@order)
+      respond_to do |format|
+        format.html { redirect_to spree.edit_admin_order_path(@order) }
+
+        format.turbo_stream { render turbo_stream: '<turbo-stream action="refresh" />' }
+      end
     end
 
     def edit

data/app/controllers/solidus_admin/products_controller.rb

@@ -11,6 +11,8 @@ module SolidusAdmin
     search_scope(:in_stock) { _1.where(id: Spree::Variant.in_stock.distinct.select(:product_id)) }
     search_scope(:out_of_stock) { _1.where.not(id: Spree::Variant.in_stock.distinct.select(:product_id)) }
 
+    before_action :split_params, only: [:update]
+
     def index
       products = apply_search_to(
         Spree::Product.includes(:master, :variants),
@@ -98,5 +100,14 @@ module SolidusAdmin
       flash[:notice] = t('.success')
       redirect_to products_path, status: :see_other
     end
+
+    def split_params
+      if params[:product][:taxon_ids].present?
+        params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+      end
+      if params[:product][:option_type_ids].present?
+        params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+      end
+    end
   end
 end

data/app/controllers/solidus_admin/refund_reasons_controller.rb

@@ -4,19 +4,86 @@ module SolidusAdmin
   class RefundReasonsController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
 
-    def index
-      refund_reasons = apply_search_to(
-        Spree::RefundReason.unscoped.order(id: :desc),
-        param: :q,
-      )
+    before_action :set_refund_reason, only: %i[edit update]
 
-      set_page_and_extract_portion_from(refund_reasons)
+    def index
+      set_index_page
 
       respond_to do |format|
         format.html { render component('refund_reasons/index').new(page: @page) }
       end
     end
 
+    def new
+      @refund_reason = Spree::RefundReason.new
+
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('refund_reasons/new').new(page: @page, refund_reason: @refund_reason) }
+      end
+    end
+
+    def create
+      @refund_reason = Spree::RefundReason.new(refund_reason_params)
+
+      if @refund_reason.save
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.refund_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('refund_reasons/new').new(page: @page, refund_reason: @refund_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def edit
+      set_index_page
+
+      respond_to do |format|
+        format.html { render component('refund_reasons/edit').new(page: @page, refund_reason: @refund_reason) }
+      end
+    end
+
+    def update
+      if @refund_reason.update(refund_reason_params)
+        respond_to do |format|
+          flash[:notice] = t('.success')
+
+          format.html do
+            redirect_to solidus_admin.refund_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('refund_reasons/edit').new(page: @page, refund_reason: @refund_reason)
+            render page_component, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
     def destroy
       @refund_reason = Spree::RefundReason.find_by!(id: params[:id])
 
@@ -28,13 +95,21 @@ module SolidusAdmin
 
     private
 
-    def load_refund_reason
-      @refund_reason = Spree::RefundReason.find_by!(id: params[:id])
-      authorize! action_name, @refund_reason
+    def set_refund_reason
+      @refund_reason = Spree::RefundReason.find(params[:id])
     end
 
     def refund_reason_params
-      params.require(:refund_reason).permit(:refund_reason_id, permitted_refund_reason_attributes)
+      params.require(:refund_reason).permit(:name, :code, :active)
+    end
+
+    def set_index_page
+      refund_reasons = apply_search_to(
+        Spree::RefundReason.unscoped.order(id: :desc),
+        param: :q,
+      )
+
+      set_page_and_extract_portion_from(refund_reasons)
     end
   end
 end

data/app/controllers/solidus_admin/reimbursement_types_controller.rb

@@ -19,11 +19,6 @@ module SolidusAdmin
 
     private
 
-    def load_reimbursement_type
-      @reimbursement_type = Spree::ReimbursementType.find_by!(id: params[:id])
-      authorize! action_name, @reimbursement_type
-    end
-
     def reimbursement_type_params
       params.require(:reimbursement_type).permit(:reimbursement_type_id, permitted_reimbursement_type_attributes)
     end