solidus_admin 0.4.0 → 0.5.0

data/app/components/solidus_admin/payment_methods/form/component.html.erb

@@ -0,0 +1,29 @@
+<%= solidus_form_for @payment_method, as: "payment_method", url: @url, html: { id: @form_id } do |f| %>
+  <%= page_with_sidebar do %>
+    <%= page_with_sidebar_main do %>
+      <%= render component("ui/panel").new do %>
+        <%= f.text_field :name %>
+        <%= f.text_area :description %>
+        <%= f.select :auto_capture,
+           auto_capture_select_options,
+           hint: t(".hints.auto_capture_html") %>
+      <% end %>
+
+      <%= render component("ui/panel").new(title: t(".deployment")) do %>
+        <%= f.select :type, available_types.map { [_1.model_name.human, _1.to_s] } %>
+        <%= f.select :preference_source, available_preference_sources, include_blank: t(".preference_source_none") %>
+        <%= f.text_field :preferred_server %>
+        <%= f.switch_field :preferred_test_mode, hint: t(".hints.test_mode_html") %>
+      <% end %>
+    <% end %>
+
+    <%= page_with_sidebar_aside do %>
+      <%= render component("ui/panel").new(title: t(".availability")) do %>
+        <%= f.checkbox :active %>
+        <%= f.select :store_ids, store_select_values, multiple: true %>
+        <%= f.checkbox :available_to_admin %>
+        <%= f.checkbox :available_to_users %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/payment_methods/form/component.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::PaymentMethods::Form::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  def initialize(payment_method:, url:, form_id:)
+    @payment_method = payment_method
+    @url = url
+    @form_id = form_id
+  end
+
+  def auto_capture_select_options
+    current_app_default =
+      Spree::Config.auto_capture ? t(".auto_capture.yes_setting") : t(".auto_capture.no_setting")
+
+    [
+      [t(".auto_capture.app_default", current_app_default:), ""],
+      [t(".auto_capture.yes_setting"), true],
+      [t(".auto_capture.no_setting"), false]
+    ]
+  end
+
+  def available_preference_sources
+    Spree::PaymentMethod.available_preference_sources
+  end
+
+  def available_types
+    Rails.application.config.spree.payment_methods.sort_by(&:name)
+  end
+
+  def store_select_values
+    Spree::Store.pluck(:name, :id)
+  end
+end

data/app/components/solidus_admin/payment_methods/form/component.yml

@@ -0,0 +1,15 @@
+en:
+  auto_capture:
+    app_default: "Use App Default (%{current_app_default})"
+    no_setting: "No"
+    yes_setting: "Yes"
+  availability: "Availability"
+  deployment: "Deployment"
+  hints:
+    auto_capture_html: >-
+      <p>Auto-capture setting charges customer's account upon transaction authorization.</p>
+      <p>Enable to reduce manual intervention and streamline the payment process.</p>
+    test_mode_html: >-
+      <p>Payment methods test mode allows users to simulate transactions using dummy data, ensuring the payment gateway's functionality without real transactions.</p>
+      <p>In test mode, users can check if payment methods, such as credit cards or digital wallets, are functioning correctly before going live with real transactions.</p>
+  preference_source_none: "Custom"

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

@@ -13,44 +13,45 @@ class SolidusAdmin::PaymentMethods::Index::Component < SolidusAdmin::UI::Pages::
     solidus_admin.payment_methods_path
   end
 
-  def row_url(payment_method)
-    spree.edit_admin_payment_method_path(payment_method)
+  def edit_path(payment_method)
+    solidus_admin.edit_payment_method_path(payment_method)
   end
 
   def sortable_options
     {
       url: ->(payment_method) { solidus_admin.move_payment_method_path(payment_method) },
-      param: 'position',
+      param: "position"
     }
   end
 
   def page_actions
     render component("ui/button").new(
       tag: :a,
-      text: t('.add'),
-      href: spree.new_admin_payment_method_path,
-      icon: "add-line",
+      text: t(".add"),
+      href: solidus_admin.new_payment_method_path,
+      icon: "add-line"
     )
   end
 
   def batch_actions
     [
       {
-        label: t('.batch_actions.delete'),
+        label: t(".batch_actions.delete"),
         action: solidus_admin.payment_methods_path,
         method: :delete,
-        icon: 'delete-bin-7-line',
-      },
+        icon: "delete-bin-7-line",
+        require_confirmation: true
+      }
     ]
   end
 
   def scopes
     [
-      { name: :all, label: t('.scopes.all'), default: true },
-      { name: :active, label: t('.scopes.active') },
-      { name: :inactive, label: t('.scopes.inactive') },
-      { name: :storefront, label: t('.scopes.storefront') },
-      { name: :admin, label: t('.scopes.admin') },
+      {name: :all, label: t(".scopes.all"), default: true},
+      {name: :active, label: t(".scopes.active")},
+      {name: :inactive, label: t(".scopes.inactive")},
+      {name: :storefront, label: t(".scopes.storefront")},
+      {name: :admin, label: t(".scopes.admin")}
     ]
   end
 
@@ -59,22 +60,22 @@ class SolidusAdmin::PaymentMethods::Index::Component < SolidusAdmin::UI::Pages::
       {
         header: :name,
         data: ->(payment_method) do
-          content_tag :div, payment_method.name
+          link_to payment_method.name, edit_path(payment_method), class: "body-link"
         end
       },
       {
         header: :type,
         data: ->(payment_method) do
-          content_tag :div, payment_method.model_name.human
+          link_to payment_method.model_name.human, edit_path(payment_method), class: "body-link"
         end
       },
       {
         header: :available_to_users,
         data: ->(payment_method) do
           if payment_method.available_to_users?
-            component('ui/badge').yes
+            component("ui/badge").yes
           else
-            component('ui/badge').no
+            component("ui/badge").no
           end
         end
       },
@@ -82,9 +83,9 @@ class SolidusAdmin::PaymentMethods::Index::Component < SolidusAdmin::UI::Pages::
         header: :available_to_admin,
         data: ->(payment_method) do
           if payment_method.available_to_admin?
-            component('ui/badge').yes
+            component("ui/badge").yes
           else
-            component('ui/badge').no
+            component("ui/badge").no
           end
         end
       },
@@ -92,12 +93,12 @@ class SolidusAdmin::PaymentMethods::Index::Component < SolidusAdmin::UI::Pages::
         header: :status,
         data: ->(payment_method) do
           if payment_method.active?
-            render component('ui/badge').new(name: t('.status.active'), color: :green)
+            render component("ui/badge").new(name: t(".status.active"), color: :green)
           else
-            render component('ui/badge').new(name: t('.status.inactive'), color: :graphite_light)
+            render component("ui/badge").new(name: t(".status.inactive"), color: :graphite_light)
           end
         end
-      },
+      }
     ]
   end
 end

data/app/components/solidus_admin/payment_methods/new/component.html.erb

@@ -0,0 +1,12 @@
+<%= page id: :resource_form do %>
+  <%= page_header do %>
+    <%= page_header_back(back_url) %>
+    <%= page_header_title(t(".title")) %>
+    <%= page_header_actions do %>
+      <%= render component("ui/button").discard(path: back_url) %>
+      <%= render component("ui/button").save(form: form_id) %>
+    <% end %>
+  <% end %>
+
+  <%= render component("payment_methods/form").new(payment_method: @resource, url: solidus_admin.payment_methods_path, form_id:) %>
+<% end %>

data/app/components/solidus_admin/payment_methods/new/component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::PaymentMethods::New::Component < SolidusAdmin::Resources::New::Component
+  include SolidusAdmin::Layout::PageHelpers
+
+  def back_url = solidus_admin.payment_methods_path
+end

data/app/components/solidus_admin/payment_methods/new/component.yml

@@ -0,0 +1,2 @@
+en:
+  title: "New Payment Method"

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

@@ -20,46 +20,46 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::UI::Pages::Index:
   def page_actions
     render component("ui/button").new(
       tag: :a,
-      text: t('.add'),
+      text: t(".add"),
       href: spree.new_admin_product_path,
-      icon: "add-line",
+      icon: "add-line"
     )
   end
 
   def batch_actions
     [
       {
-        label: t('.batch_actions.delete'),
+        label: t(".batch_actions.delete"),
         action: solidus_admin.products_path,
         method: :delete,
-        icon: 'delete-bin-7-line',
-        require_confirmation: true,
+        icon: "delete-bin-7-line",
+        require_confirmation: true
       },
       {
-        label: t('.batch_actions.discontinue'),
+        label: t(".batch_actions.discontinue"),
         action: solidus_admin.discontinue_products_path,
         method: :put,
-        icon: 'pause-circle-line',
-        require_confirmation: true,
+        icon: "pause-circle-line",
+        require_confirmation: true
       },
       {
-        label: t('.batch_actions.activate'),
+        label: t(".batch_actions.activate"),
         action: solidus_admin.activate_products_path,
         method: :put,
-        icon: 'play-circle-line',
-        require_confirmation: true,
-      },
+        icon: "play-circle-line",
+        require_confirmation: true
+      }
     ]
   end
 
   def scopes
     [
-      { name: :all, label: t('.scopes.all'), default: true },
-      { name: :in_stock, label: t('.scopes.in_stock') },
-      { name: :out_of_stock, label: t('.scopes.out_of_stock') },
-      { name: :available, label: t('.scopes.available') },
-      { name: :discontinued, label: t('.scopes.discontinued') },
-      { name: :deleted, label: t('.scopes.deleted') },
+      {name: :all, label: t(".scopes.all"), default: true},
+      {name: :in_stock, label: t(".scopes.in_stock")},
+      {name: :out_of_stock, label: t(".scopes.out_of_stock")},
+      {name: :available, label: t(".scopes.available")},
+      {name: :discontinued, label: t(".scopes.discontinued")},
+      {name: :deleted, label: t(".scopes.deleted")}
     ]
   end
 
@@ -67,10 +67,10 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::UI::Pages::Index:
     Spree::OptionType.all.map do |option_type|
       {
         label: option_type.presentation,
-        combinator: 'or',
+        combinator: "or",
         attribute: "option_values_id",
         predicate: "in",
-        options: option_type.option_values.pluck(:name, :id),
+        options: option_type.option_values.pluck(:name, :id)
       }
     end
   end
@@ -81,19 +81,19 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::UI::Pages::Index:
       name_column,
       status_column,
       price_column,
-      stock_column,
+      stock_column
     ]
   end
 
   def image_column
     {
-      col: { class: "w-[72px]" },
-      header: tag.span('aria-label': t('.image'), role: 'text'),
+      col: {class: "w-[72px]"},
+      header: tag.span("aria-label": t(".image"), role: "text"),
       data: ->(product) do
         image = product.gallery.images.first or return
 
         render(
-          component('ui/thumbnail').new(
+          component("ui/thumbnail").new(
             src: image.url(:small),
             alt: product.name
           )
@@ -114,14 +114,14 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::UI::Pages::Index:
   def status_column
     {
       header: :status,
-      data: ->(product) { component('products/status').from_product(product) }
+      data: ->(product) { component("products/status").from_product(product) }
     }
   end
 
   def stock_column
     {
       header: :stock,
-      data: ->(product) { component('products/stock').from_product(product) }
+      data: ->(product) { component("products/stock").from_product(product) }
     }
   end
 

data/app/components/solidus_admin/products/show/categories/new/component.html.erb

@@ -0,0 +1,17 @@
+<%= turbo_frame_tag :new_product_category, target: :product_organization_frame do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @taxon, url: solidus_admin.product_taxons_path(@product), method: :post, html: { id: dom_id(@taxon) } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+        <%= render component("ui/forms/field").select(f, :parent_id, parent_taxon_options, include_blank: t(".none")) %>
+        <%= render component("ui/forms/field").text_area(f, :description) %>
+      </div>
+    <% end %>
+    <% modal.with_actions do %>
+      <form method="dialog">
+        <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+      </form>
+      <%= render component("ui/button").new(type: :submit, text: t('.submit'), form: dom_id(@taxon)) %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/products/show/categories/new/component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Products::Show::Categories::New::Component < SolidusAdmin::BaseComponent
+  def initialize(product:, taxon: nil)
+    @product = product
+    @taxon = taxon || product.taxons.build
+  end
+
+  private
+
+  def parent_taxon_options
+    @parent_taxon_options ||= Spree::Taxon.order(:lft).pluck(:name, :id, :depth).map do
+      name, id, depth = _1
+      ["#{"    " * depth} → #{name}", id, {data: {item_label: name}}]
+    end
+  end
+end

data/app/components/solidus_admin/products/show/categories/new/component.yml

@@ -0,0 +1,5 @@
+en:
+  cancel: "Cancel"
+  none: "None"
+  submit: "Add Category"
+  title: "New Category"

data/app/components/solidus_admin/products/show/component.html.erb

@@ -19,124 +19,147 @@
         target: :_blank,
         scheme: :ghost
       ) %>
-      <%= render component("ui/button").new(tag: :button, text: t(".save"), form: form_id) %>
+      <%= render component("ui/button").save(form: form_id) %>
     <% end %>
   <% end %>
 
-  <%= form_for @product, url: solidus_admin.product_path(@product), html: { id: form_id } do |f| %>
+  <%= solidus_form_for @product, url: solidus_admin.product_path(@product), html: { id: form_id } do |f| %>
     <%= page_with_sidebar do %>
       <%= page_with_sidebar_main do %>
-        <%= render component('ui/panel').new do %>
-          <%= render component("ui/forms/field").text_field(f, :name) %>
-          <%= render component("ui/forms/field").text_field(f, :slug) %>
-          <%= render component("ui/forms/field").text_area(f, :description) %>
+        <%= render component("ui/panel").new do %>
+          <%= f.text_field(:name) %>
+          <%= f.text_field(:slug) %>
+          <%= f.text_area(:description) %>
         <% end %>
 
-        <%= render component('ui/panel').new(title: 'SEO') do %>
-          <%= render component("ui/forms/field").text_field(f, :meta_title) %>
-          <%= render component("ui/forms/field").text_field(f, :meta_description) %>
-          <%= render component("ui/forms/field").text_area(f, :meta_keywords) %>
-          <%= render component("ui/forms/field").text_field(f, :gtin) %>
-          <%= render component("ui/forms/field").select(
-            f,
-            :condition,
-            condition_options,
-            include_blank: t('spree.unset'),
-          ) %>
+        <%= render component("ui/panel").new(title: t(".seo")) do %>
+          <%= f.text_field(:meta_title) %>
+          <%= f.text_field(:meta_description) %>
+          <%= f.text_area(:meta_keywords) %>
+          <%= f.text_field(:gtin) %>
+          <%= f.select(:condition, condition_options, include_blank: t("spree.unset")) %>
         <% end %>
-        <%= render component('ui/panel').new(title: "Media") do |panel| %>
+        <%= render component("ui/panel").new(title: t(".media")) do |panel| %>
           <% panel.with_action(
             name: t(".manage_images"),
+            scheme: :secondary,
             href: spree.admin_product_images_path(@product)
           ) %>
         <% end %>
 
-        <%= render component('ui/panel').new(title: 'Pricing') do %>
-          <%= render component("ui/forms/field").text_field(f, :price) %>
+        <%= render component("ui/panel").new(title: t(".pricing")) do %>
+          <%= f.text_field(:price) %>
           <div class="flex gap-4 justify-items-stretch">
-            <%= render component("ui/forms/field").text_field(f, :cost_price) %>
-            <%= render component("ui/forms/field").text_field(f, :cost_currency) %>
+            <%= f.text_field(:cost_price) %>
+            <%= f.text_field(:cost_currency) %>
           </div>
         <% end %>
 
-        <%= render component('ui/panel').new(title: 'Stock') do |panel| %>
-          <%= render component("ui/forms/field").text_field(f, :sku) %>
+        <%= render component("ui/panel").new(title: t(".stock")) do |panel| %>
+          <%= f.text_field(:sku) %>
 
           <% panel.with_action(
             name: t(".manage_stock"),
+            scheme: :secondary,
             href: spree.admin_product_stock_path(@product)
           ) %>
         <% end %>
 
-        <%= render component('ui/panel').new(title: 'Shipping') do %>
-          <%= render component("ui/forms/field").select(
-            f,
+        <%= render component("ui/panel").new(title: t(".shipping")) do %>
+          <%= f.select(
             :shipping_category_id,
             [[t(".none"), nil]] + Spree::ShippingCategory.order(:name).pluck(:name, :id),
-            tip: t(".hints.shipping_category_html"),
+            tip: t(".hints.shipping_category_html")
           ) %>
-          <%= render component("ui/forms/field").select(
-            f,
+          <%= f.select(
             :tax_category_id,
             [[t(".none"), nil]] + Spree::TaxCategory.order(:name).pluck(:name, :id),
-            tip: t(
-              ".hints.tax_category_html",
-              default_tax_category: Spree::TaxCategory.default&.name
-            ),
+            tip: t(".hints.tax_category_html")
           ) %>
         <% end %>
 
-        <%= render component('ui/panel').new(title: "Options") do %>
-          <%= render component("ui/forms/field").select(
-            f,
-            :option_type_ids,
-            option_type_options,
-            multiple: true,
-            "size" => option_type_options.size,
+        <%= render component("ui/panel").new(title: t(".options")) do |panel| %>
+          <% if @product.product_option_types.present? %>
+            <% panel.with_section do %>
+              <div class="flex flex-col gap-4" data-controller="sortable" data-sortable-handle-value=".handle">
+                <% @product.product_option_types.includes(option_type: :option_values).order(:position).each do |product_option| %>
+                  <div class="flex gap-2 justify-between" data-sortable-url=<%= solidus_admin.move_product_option_type_path(product_option) %>>
+                    <div class="flex gap-2">
+                      <div class="flex items-center">
+                        <%= render component("ui/icon").new(name: "draggable", class: "w-6 h-6 cursor-grab handle fill-gray-500") %>
+                      </div>
+                      <div class="flex flex-col gap-2">
+                        <span class="font-semibold text-sm"><%= product_option.option_type.name %>:<%= product_option.option_type.presentation %></span>
+                        <div class="flex gap-2 flex-wrap">
+                          <% product_option.option_type.option_values.each do |value| %>
+                            <%= render component("ui/badge").new(name: "#{value.name}:#{value.presentation}") %>
+                          <% end %>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="flex items-center">
+                      <%= render component("ui/button").new(tag: :a, href: spree.edit_admin_option_type_path(product_option.option_type), scheme: :secondary, text: t(".edit")) %>
+                    </div>
+                  </div>
+                <% end %>
+              </div>
+            <% end %>
+          <% end %>
+
+          <div class="flex gap-4 justify-between items-end">
+            <%= hidden_field_tag "#{f.object_name}[option_type_ids][]", nil %>
+            <%= f.select(:option_type_ids, option_type_options, multiple: true) %>
+            <%= render component("ui/button").new(type: :submit, text: t(".save")) %>
+          </div>
+
+          <% panel.with_action(
+            name: t(".manage_options"),
+            scheme: :secondary,
+            href: solidus_admin.option_types_path
           ) %>
         <% end %>
 
-        <%= render component('ui/panel').new(title: "Specifications") do |panel| %>
+        <%= render component("ui/panel").new(title: t(".specifications")) do |panel| %>
           <% panel.with_action(
             name: t(".manage_properties"),
+            scheme: :secondary,
             href: spree.admin_product_product_properties_path(@product)
           ) %>
         <% end %>
       <% end %>
 
       <%= page_with_sidebar_aside do %>
-        <%= render component('ui/panel').new(title: "Publishing") do %>
-          <%= render component("ui/forms/field").text_field(
-            f,
+        <%= render component("ui/panel").new(title: t(".publishing")) do %>
+          <%= f.text_field(
             :available_on,
-            hint: t(".available_on_html"),
+            hint: t(".hints.available_on_html"),
             type: :date,
             value: f.object.available_on&.to_date
           ) %>
-          <%= render component("ui/forms/field").text_field(
-            f,
+          <%= f.text_field(
             :discontinue_on,
-            hint: t(".discontinue_on_html"),
+            hint: t(".hints.discontinue_on_html"),
             type: :date,
             value: f.object.discontinue_on&.to_date
           ) %>
-          <label class="flex gap-2 items-center">
-            <%= render component("ui/forms/checkbox").new(
-              name: "#{f.object_name}[promotionable]",
-              checked: f.object.promotionable
-            ) %>
-            <span class="font-normal text-xs"><%= Spree::Product.human_attribute_name :promotionable %></span>
-            <%= render component("ui/toggletip").new(text: t(".hints.promotionable_html")) %>
-          </label>
+          <%= f.checkbox(:promotionable, hint: t(".hints.promotionable_html")) %>
         <% end %>
 
-        <%= render component('ui/panel').new(title: "Product organization") do %>
-          <%= render component("ui/forms/field").select(
-            f,
-            :taxon_ids,
-            taxon_options,
-            multiple: true,
-            "size" => taxon_options.size, # use a string key to avoid setting the size of the component
+        <%= render component("ui/panel").new(title: t(".product_organization")) do |panel| %>
+          <%= hidden_field_tag "#{f.object_name}[taxon_ids][]", nil %>
+
+          <%= render component("turbo/target_frame").new(:product_organization_frame, source: :new_product_category) do %>
+            <%= render component("ui/forms/field").select(
+              f,
+              :taxon_ids,
+              taxon_options,
+              multiple: true
+            ) %>
+          <% end %>
+          <% panel.with_action(
+            name: t(".add_new_category"),
+            href: solidus_admin.new_product_taxon_path(@product),
+            data: { turbo_frame: :new_product_category }
           ) %>
         <% end %>
       <% end %>
@@ -150,11 +173,12 @@
           tag: :button,
           text: t(".delete"),
           scheme: :danger,
-          "data-action": "click->#{stimulus_id}#confirmDelete",
-          "data-#{stimulus_id}-message-param": t(".delete_confirmation"),
+          "data-turbo-confirm": t(".delete_confirmation")
         ) %>
       <% end %>
     <% end %>
     <%= render component("ui/button").new(tag: :button, text: t(".save"), form: form_id) %>
   <% end %>
 <% end %>
+
+<%= turbo_frame_tag :new_product_category, target: :product_organization_frame %>

data/app/components/solidus_admin/products/show/component.rb

@@ -16,13 +16,13 @@ class SolidusAdmin::Products::Show::Component < SolidusAdmin::BaseComponent
   def taxon_options
     @taxon_options ||= Spree::Taxon.order(:lft).pluck(:name, :id, :lft, :depth).map do
       name, id, _lft, depth = _1
-      ["#{'    ' * depth} → #{name}", id]
+      ["#{"    " * depth} → #{name}", id, {data: {item_label: name}}]
     end
   end
 
   def option_type_options
     @option_type_options ||= Spree::OptionType.order(:presentation).pluck(:presentation, :name, :id).map do
-      ["#{_1} (#{_2})", _3]
+      ["#{_2}:#{_1}", _3]
     end
   end