solidus_admin 0.3.2 → 0.4.0

data/app/components/solidus_admin/users/store_credits/edit_amount/component.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::StoreCredits::EditAmount::Component < SolidusAdmin::Resources::Edit::Component
+  def initialize(user:, store_credit:, reasons:)
+    @user = user
+    super(store_credit)
+    @store_credit_reasons = reasons
+  end
+
+  def form_id
+    dom_id(@store_credit, "#{stimulus_id}_edit_amount_form")
+  end
+
+  def form_url
+    solidus_admin.update_amount_user_store_credit_path(@user, @store_credit, **search_filter_params)
+  end
+
+  def store_credit_reasons_select_options
+    # Placeholder + Store Credit Reasons
+    "<option value>#{t('.choose_reason')}</option>" + options_from_collection_for_select(@store_credit_reasons, :id, :name)
+  end
+end

data/app/components/solidus_admin/users/store_credits/edit_amount/component.yml

@@ -0,0 +1,5 @@
+en:
+  title: Edit Store Credit Amount
+  cancel: Cancel
+  submit: Update Store Credit
+  choose_reason: Choose Reason For Changing Amount

data/app/components/solidus_admin/users/store_credits/edit_memo/component.html.erb

@@ -0,0 +1,15 @@
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :memo) %>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/users/store_credits/edit_memo/component.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::StoreCredits::EditMemo::Component < SolidusAdmin::Resources::Edit::Component
+  def initialize(user:, store_credit:)
+    @user = user
+    super(store_credit)
+  end
+
+  def form_id
+    dom_id(@store_credit, "#{stimulus_id}_edit_memo_form")
+  end
+
+  def form_url
+    solidus_admin.update_memo_user_store_credit_path(@user, @store_credit, **search_filter_params)
+  end
+end

data/app/components/solidus_admin/users/store_credits/edit_memo/component.yml

@@ -0,0 +1,4 @@
+en:
+  title: Edit Store Credit Memo
+  cancel: Cancel
+  submit: Update Store Credit

data/app/components/solidus_admin/users/store_credits/edit_validity/component.html.erb

@@ -0,0 +1,21 @@
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").select(
+          f,
+          :store_credit_reason_id,
+          store_credit_reasons_select_options.html_safe,
+          include_blank: t('spree.choose_reason'),
+          html: { required: true }
+        ) %>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, scheme: :danger, type: :submit, text: t('.submit')) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/users/store_credits/edit_validity/component.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::StoreCredits::EditValidity::Component < SolidusAdmin::Resources::Edit::Component
+  def initialize(user:, store_credit:, reasons:)
+    @user = user
+    super(store_credit)
+    @store_credit_reasons = reasons
+  end
+
+  def form_id
+    dom_id(@store_credit, "#{stimulus_id}_edit_validity_form")
+  end
+
+  def form_url
+    solidus_admin.invalidate_user_store_credit_path(@user, @store_credit, **search_filter_params)
+  end
+
+  def store_credit_reasons_select_options
+    # Placeholder + Store Credit Reasons
+    "<option value>#{t('.choose_reason')}</option>" + options_from_collection_for_select(@store_credit_reasons, :id, :name)
+  end
+end

data/app/components/solidus_admin/users/store_credits/edit_validity/component.yml

@@ -0,0 +1,5 @@
+en:
+  title: Invalidate Store Credit
+  cancel: Cancel
+  submit: Invalidate
+  choose_reason: Choose Reason For Invalidating

data/app/components/solidus_admin/users/store_credits/index/component.html.erb

@@ -4,7 +4,15 @@
     <%= page_header_title(t(".title", email: @user.email)) %>
 
     <%= page_header_actions do %>
-      <%= render component("ui/button").new(tag: :a, text: t(".add_store_credit"), href: spree.new_admin_user_store_credit_url(user_id: @user.id, only_path: true)) %>
+      <%= render component("ui/button").new(
+        tag: :a,
+        href: new_store_credit_path,
+        data: {
+          turbo_frame: :resource_modal
+        },
+        text: t(".add_store_credit"),
+        icon: "add-line"
+      )%>
     <% end %>
   <% end %>
 
@@ -23,21 +31,27 @@
 
           <%= render component('ui/panel').new(title: title) do %>
             <%= render component('ui/table').new(
-                id: stimulus_id,
-                data: {
-                  class: model_class,
-                  rows: credits,
-                  fade: -> (_order) { false },
-                  columns: columns,
-                  url: -> { row_url(_1) },
-                },
-            )%>
+              id: stimulus_id,
+              data: {
+                class: model_class,
+                rows: credits,
+                fade: -> (_order) { false },
+                columns: columns
+              }
+            ) %>
           <% end %>
         <% end %>
       <% else %>
         <%= render component('ui/panel').new(title: t(".store_credit")) do %>
           <%= t(".no_credits_found") %>
-          <%= render component("ui/button").new(tag: :a, text: t(".create_one"), href: spree.new_admin_user_store_credit_url(user_id: @user.id, only_path: true)) %>
+          <%= render component("ui/button").new(
+            tag: :a,
+            data: {
+              turbo_frame: :resource_modal
+            },
+            href: new_store_credit_path,
+            text: t(".create_one"),
+          )%>
         <% end %>
       <% end %>
     <% end %>
@@ -46,4 +60,6 @@
       <%= render component("users/stats").new(user: @user) %>
     <% end %>
   <% end %>
+
+  <%= turbo_frame_tag :resource_modal, target: "_top" %>
 <% end %>

data/app/components/solidus_admin/users/store_credits/index/component.rb

@@ -36,7 +36,7 @@ class SolidusAdmin::Users::StoreCredits::Index::Component < SolidusAdmin::BaseCo
       },
       {
         text: t('.store_credit'),
-        href: solidus_admin.store_credits_user_path(@user),
+        href: solidus_admin.user_store_credits_path(@user),
         current: true,
       },
     ]
@@ -46,8 +46,12 @@ class SolidusAdmin::Users::StoreCredits::Index::Component < SolidusAdmin::BaseCo
     @store_credits
   end
 
-  def row_url(store_credit)
-    spree.admin_user_store_credit_path(@user, store_credit)
+  def show_path(store_credit)
+    solidus_admin.user_store_credit_path(@user, store_credit)
+  end
+
+  def new_store_credit_path
+    solidus_admin.new_user_store_credit_path(user_id: @user.id)
   end
 
   def columns
@@ -56,21 +60,21 @@ class SolidusAdmin::Users::StoreCredits::Index::Component < SolidusAdmin::BaseCo
         header: :credited,
         col: { class: "w-[12%]" },
         data: ->(store_credit) do
-          content_tag :div, store_credit.display_amount.to_html, class: "text-sm"
+          link_to store_credit.display_amount.to_html, show_path(store_credit), class: "body-link text-sm"
         end
       },
       {
         header: :authorized,
         col: { class: "w-[13%]" },
         data: ->(store_credit) do
-          content_tag :div, store_credit.display_amount_authorized.to_html, class: "text-sm"
+          link_to store_credit.display_amount_authorized.to_html, show_path(store_credit), class: "body-link text-sm"
         end
       },
       {
         header: :used,
         col: { class: "w-[9%]" },
         data: ->(store_credit) do
-          content_tag :div, store_credit.display_amount_used.to_html, class: "text-sm"
+          link_to store_credit.display_amount_used.to_html, show_path(store_credit), class: "body-link text-sm"
         end
       },
       {
@@ -84,23 +88,27 @@ class SolidusAdmin::Users::StoreCredits::Index::Component < SolidusAdmin::BaseCo
         header: :created_by,
         col: { class: "w-[22%]" },
         data: ->(store_credit) do
-          content_tag :div, store_credit.created_by_email, class: "font-semibold text-sm"
+          content_tag :div, store_credit.created_by_email, class: "text-sm"
         end
       },
       {
         header: :issued_on,
         col: { class: "w-[16%]" },
         data: ->(store_credit) do
-          I18n.l(store_credit.created_at.to_date)
+          content_tag :span, I18n.l(store_credit.created_at.to_date), class: "text-sm"
         end
       },
       {
         header: :invalidated,
         col: { class: "w-[15%]" },
         data: ->(store_credit) do
-          store_credit.invalidated? ? component('ui/badge').yes : component('ui/badge').no
+          if store_credit.invalidated?
+            component('ui/badge').new(name: :yes, color: :red, size: :m)
+          else
+            component('ui/badge').new(name: :no, color: :green, size: :m)
+          end
         end
-      },
+      }
     ]
   end
 end

data/app/components/solidus_admin/users/store_credits/new/component.html.erb

@@ -0,0 +1,30 @@
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @store_credit, url: form_url, method: :post, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :amount, class: "required") %>
+        <%= render component("ui/forms/field").select(
+          f,
+          :currency,
+          currency_select_options.html_safe,
+          include_blank: t("spree.currency"),
+          html: { required: true }
+        ) %>
+        <%= render component("ui/forms/field").select(
+          f,
+          :category_id,
+          store_credit_categories_select_options.html_safe,
+          include_blank: t("spree.category"),
+          html: { required: true }
+        ) %>
+        <%= render component("ui/forms/field").text_field(f, :memo) %>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t(".cancel")) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t(".submit")) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/users/store_credits/new/component.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::StoreCredits::New::Component < SolidusAdmin::Resources::New::Component
+  def initialize(user:, store_credit:, categories:)
+    @user = user
+    super(store_credit)
+    @store_credit_categories = categories
+  end
+
+  def form_url
+    solidus_admin.user_store_credits_path(@user, **search_filter_params)
+  end
+
+  def currency_select_options
+    options_from_collection_for_select(Spree::Config.available_currencies, :iso_code, :iso_code, Spree::Config.currency)
+  end
+
+  def store_credit_categories_select_options
+    # Placeholder + Store Credit Categories
+    "<option value>#{t('.choose_category')}</option>" + options_from_collection_for_select(@store_credit_categories, :id, :name)
+  end
+end

data/app/components/solidus_admin/users/store_credits/new/component.yml

@@ -0,0 +1,5 @@
+en:
+  title: New Store Credit
+  cancel: Cancel
+  submit: Create
+  choose_category: Choose Store Credit Category

data/app/components/solidus_admin/users/store_credits/show/component.html.erb

@@ -0,0 +1,83 @@
+<%= page do %>
+  <%= page_header do %>
+    <%= page_header_back(solidus_admin.users_path) %>
+    <%= page_header_title(t(".title", email: @user.email, amount: @store_credit.display_amount)) %>
+  <% 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(".store_credit")) do |panel| %>
+        <% panel.with_section do %>
+          <%= render component('ui/details_list').new(
+            items: [
+              { label: t('.credited'), value: @store_credit.display_amount },
+              { label: t('.created_by'), value: @store_credit.created_by_email },
+              { label: t('.type'), value: @store_credit.category_name },
+              { label: t('.memo'), value: @store_credit.memo }
+            ]
+          ) %>
+        <% end %>
+
+        <% panel.with_section do %>
+          <div class="w-[100%] text-right">
+            <% if @store_credit.invalidateable? %>
+              <%= render component("ui/button").new(
+                tag: :a,
+                scheme: :danger,
+                data: {
+                  turbo_frame: :resource_modal
+                },
+                href: edit_validity_url,
+                text: t(".invalidate"),
+              ) %>
+            <% end %>
+
+            <%= render component("ui/button").new(
+              tag: :a,
+              data: {
+                turbo_frame: :resource_modal
+              },
+              href: edit_memo_url,
+              text: t(".edit_memo"),
+            ) %>
+
+            <% if @store_credit.editable? %>
+              <%= render component("ui/button").new(
+                tag: :a,
+                data: {
+                  turbo_frame: :resource_modal
+                },
+                href: edit_amount_url,
+                text: t(".edit_amount"),
+              ) %>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
+
+      <% if @events.present? %>
+        <h1 class="font-semibold text-base text-center w-[100%]"><%= t(".store_credit_history") %></h1>
+        <%= render component('ui/table').new(
+          id: stimulus_id,
+          data: {
+            class: event_model_class,
+            rows: @events,
+            columns: columns,
+          },
+        )%>
+      <% end %>
+    <% end %>
+
+    <%= page_with_sidebar_aside do %>
+      <%= render component("users/stats").new(user: @user) %>
+    <% end %>
+  <% end %>
+
+  <%= turbo_frame_tag :resource_modal, target: "_top" %>
+<% end %>

data/app/components/solidus_admin/users/store_credits/show/component.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::StoreCredits::Show::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+  include Spree::Admin::StoreCreditEventsHelper
+
+  def initialize(user:, store_credit:, events:)
+    @user = user
+    @store_credit = store_credit
+    @events = events
+  end
+
+  def model_class
+    Spree::StoreCredit
+  end
+
+  def event_model_class
+    Spree::StoreCreditEvent
+  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: false,
+      },
+      {
+        text: t('.items'),
+        href: spree.items_admin_user_path(@user),
+        current: false,
+      },
+      {
+        text: t('.store_credit'),
+        href: solidus_admin.user_store_credits_path(@user),
+        current: true,
+      },
+    ]
+  end
+
+  def form_id
+    @form_id ||= "#{stimulus_id}--form-#{@store_credit.id}"
+  end
+
+  def edit_validity_url
+    solidus_admin.edit_validity_user_store_credit_path(@user, @store_credit, **search_filter_params)
+  end
+
+  def edit_memo_url
+    solidus_admin.edit_memo_user_store_credit_path(@user, @store_credit, **search_filter_params)
+  end
+
+  def edit_amount_url
+    solidus_admin.edit_amount_user_store_credit_path(@user, @store_credit, **search_filter_params)
+  end
+
+  def columns
+    [
+      {
+        header: :date,
+        col: { class: "w-[15%]" },
+        data: ->(event) do
+          content_tag :span, I18n.l(event.created_at, format: :short), class: "text-sm"
+        end
+      },
+      {
+        header: :action,
+        col: { class: "w-[10%]" },
+        data: ->(event) do
+          content_tag :span, store_credit_event_admin_action_name(event), class: "text-sm"
+        end
+      },
+      {
+        header: :credited,
+        col: { class: "w-[10%]" },
+        data: ->(event) do
+          content_tag :span, event.display_amount, class: "text-sm"
+        end
+      },
+      {
+        header: :created_by,
+        col: { class: "w-[20%]" },
+        data: ->(event) do
+          content_tag :span, store_credit_event_originator_link(event), class: "body-link text-sm"
+        end
+      },
+      {
+        header: :total_amount,
+        col: { class: "w-[10%]" },
+        data: ->(event) do
+          content_tag :span, event.display_user_total_amount, class: "text-sm"
+        end
+      },
+      {
+        header: :total_unused,
+        col: { class: "w-[10%]" },
+        data: ->(event) do
+          content_tag :span, event.display_remaining_amount, class: "text-sm"
+        end
+      },
+      {
+        header: :reason_for_updating,
+        col: { class: "w-[25%]" },
+        data: ->(event) do
+          content_tag :span, event.store_credit_reason&.name, class: "text-sm"
+        end
+      },
+    ]
+  end
+end

data/app/components/solidus_admin/users/store_credits/show/component.yml

@@ -0,0 +1,18 @@
+en:
+  title: "Users / %{email} / Store Credit / %{amount}"
+  account: Account
+  addresses: Addresses
+  order_history: Order History
+  items: Items
+  store_credit: Store Credit
+  last_active: Last Active
+  add_store_credit: Add Store Credit
+  edit_amount: Edit Amount
+  edit_memo: Edit Memo
+  invalidate: Invalidate
+  store_credit_history: Store Credit History
+  credited: Credited
+  created_by: Created By
+  type: Type
+  memo: Memo
+  back: Back

data/app/controllers/solidus_admin/adjustment_reasons_controller.rb

@@ -1,115 +1,13 @@
 # frozen_string_literal: true
 
 module SolidusAdmin
-  class AdjustmentReasonsController < SolidusAdmin::BaseController
-    include SolidusAdmin::ControllerHelpers::Search
-
-    before_action :set_adjustment_reason, only: %i[edit update]
-
-    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])
-
-      Spree::AdjustmentReason.transaction { @adjustment_reason.destroy }
-
-      flash[:notice] = t('.success')
-      redirect_back_or_to adjustment_reasons_path, status: :see_other
-    end
-
+  class AdjustmentReasonsController < SolidusAdmin::ResourcesController
     private
 
-    def set_adjustment_reason
-      @adjustment_reason = Spree::AdjustmentReason.find(params[:id])
-    end
+    def resource_class = Spree::AdjustmentReason
 
-    def adjustment_reason_params
+    def permitted_resource_params
       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/authentication_adapters/backend.rb

@@ -13,7 +13,7 @@ module SolidusAdmin::AuthenticationAdapters::Backend
   def authenticate_solidus_backend_user!
     return if spree_current_user
 
-    instance_exec(&Spree::Admin::BaseController.unauthorized_redirect)
+    Spree::Backend::Config.unauthorized_redirect_handler_class.new(self).call
   end
 
   def store_location