solidus_admin 0.0.2 → 0.2.0

data/app/components/solidus_admin/orders/show/summary/component.html.erb

@@ -0,0 +1,14 @@
+<div class="<%= stimulus_id %> w-full">
+  <%= render component('ui/panel').new(title: t('.summary')) do %>
+    <%= render component('ui/details_list').new(
+      items: [
+        { label: t('.subtotal'), value: number_to_currency(@order.item_total), class: 'font-semibold' },
+        { label: t('.taxes'), value: number_to_currency(@order.additional_tax_total) },
+        { label: t('.shipping'), value: number_to_currency(@order.shipment_total) },
+        { label: link_to(t('.add_promo_code'), '#', class: "body-link"), value: number_to_currency(@order.promo_total) },
+        { label: link_to(t('.adjustments'), '#', class: "body-link"), value: number_to_currency(@order.adjustment_total) },
+        { label: t('.total'), value: number_to_currency(@order.total), class: 'font-semibold' }
+      ]
+    ) %>
+  <% end %>
+</div>

data/app/components/solidus_admin/orders/show/summary/component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Summary::Component < SolidusAdmin::BaseComponent
+  def initialize(order:)
+    @order = order
+  end
+end

data/app/components/solidus_admin/orders/show/summary/component.yml

@@ -0,0 +1,8 @@
+en:
+  summary: Summary
+  subtotal: Subtotal
+  taxes: Taxes
+  shipping: Shipping
+  add_promo_code: Add Promo Code
+  adjustments: Adjustments
+  total: Total

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

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::PaymentMethods::Index::Component < SolidusAdmin::UI::Pages::Index::Component
+  def model_class
+    Spree::PaymentMethod
+  end
+
+  def search_key
+    :name_or_description_cont
+  end
+
+  def search_url
+    solidus_admin.payment_methods_path
+  end
+
+  def row_url(payment_method)
+    spree.edit_admin_payment_method_path(payment_method)
+  end
+
+  def sortable_options
+    {
+      url: ->(payment_method) { solidus_admin.move_payment_method_path(payment_method) },
+      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",
+    )
+  end
+
+  def batch_actions
+    [
+      {
+        display_name: t('.batch_actions.delete'),
+        action: solidus_admin.payment_methods_path,
+        method: :delete,
+        icon: 'delete-bin-7-line',
+      },
+    ]
+  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') },
+    ]
+  end
+
+  def columns
+    [
+      {
+        header: :name,
+        data: ->(payment_method) do
+          content_tag :div, payment_method.name
+        end
+      },
+      {
+        header: :type,
+        data: ->(payment_method) do
+          content_tag :div, payment_method.model_name.human
+        end
+      },
+      {
+        header: :available_to_users,
+        data: ->(payment_method) do
+          if payment_method.available_to_users?
+            component('ui/badge').yes
+          else
+            component('ui/badge').no
+          end
+        end
+      },
+      {
+        header: :available_to_admin,
+        data: ->(payment_method) do
+          if payment_method.available_to_admin?
+            component('ui/badge').yes
+          else
+            component('ui/badge').no
+          end
+        end
+      },
+      {
+        header: :status,
+        data: ->(payment_method) do
+          if payment_method.active?
+            render component('ui/badge').new(name: t('.status.active'), color: :green)
+          else
+            render component('ui/badge').new(name: t('.status.inactive'), color: :graphite_light)
+          end
+        end
+      },
+    ]
+  end
+end

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

@@ -0,0 +1,10 @@
+en:
+  status:
+    active: Active
+    inactive: Inactive
+  scopes:
+    active: Active
+    inactive: Inactive
+    admin: Admin
+    storefront: Storefront
+    all: All

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

@@ -1,20 +1,29 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::Products::Index::Component < SolidusAdmin::BaseComponent
-  def initialize(page:)
-    @page = page
+class SolidusAdmin::Products::Index::Component < SolidusAdmin::UI::Pages::Index::Component
+  def model_class
+    Spree::Product
   end
 
-  def title
-    Spree::Product.model_name.human.pluralize
+  def search_key
+    :name_or_variants_including_master_sku_cont
   end
 
-  def prev_page_link
-    @page.first? ? nil : solidus_admin.url_for(host: request.host, port: request.port, **request.params, page: @page.number - 1)
+  def search_url
+    solidus_admin.products_path
   end
 
-  def next_page_link
-    @page.last? ? nil : solidus_admin.url_for(host: request.host, port: request.port, **request.params, page: @page.next_param)
+  def row_url(product)
+    solidus_admin.product_path(product)
+  end
+
+  def page_actions
+    render component("ui/button").new(
+      tag: :a,
+      text: t('.add'),
+      href: spree.new_admin_product_path,
+      icon: "add-line",
+    )
   end
 
   def batch_actions
@@ -40,16 +49,29 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::BaseComponent
     ]
   end
 
-  def filters
+  def scopes
     [
-      {
-        name: 'q[with_discarded]',
-        value: true,
-        label: t('.filters.with_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
 
+  def filters
+    Spree::OptionType.all.map do |option_type|
+      {
+        presentation: option_type.presentation,
+        combinator: 'or',
+        attribute: "variants_option_values",
+        predicate: "in",
+        options: option_type.option_values.pluck(:name, :id),
+      }
+    end
+  end
+
   def columns
     [
       image_column,
@@ -62,16 +84,16 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::BaseComponent
 
   def image_column
     {
-      class_name: "w-[72px]",
-      header: tag.span('aria-label': t('.product_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
 
-        link_to(
-          image_tag(image.url(:small), class: 'h-10 w-10 max-w-min rounded border border-gray-100', alt: product.name),
-          solidus_admin.product_path(product),
-          class: 'inline-flex overflow-hidden',
-          tabindex: -1,
+        render(
+          component('ui/thumbnail').new(
+            src: image.url(:small),
+            alt: product.name
+          )
         )
       end
     }
@@ -81,7 +103,7 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::BaseComponent
     {
       header: :name,
       data: ->(product) do
-        link_to product.name, solidus_admin.product_path(product)
+        content_tag :div, product.name
       end
     }
   end
@@ -89,29 +111,14 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::BaseComponent
   def status_column
     {
       header: :status,
-      data: ->(product) { component('products/status').new(product: product) }
+      data: ->(product) { component('products/status').from_product(product) }
     }
   end
 
   def stock_column
     {
       header: :stock,
-      data: ->(product) do
-        stock_info =
-          case (on_hand = product.total_on_hand)
-          when Float::INFINITY
-            content_tag :span, t('.stock.in_stock', on_hand: t('.stock.infinity')), class: 'text-forest'
-          when 1..Float::INFINITY
-            content_tag :span, t('.stock.in_stock', on_hand: on_hand), class: 'text-forest'
-          else
-            content_tag :span, t('.stock.in_stock', on_hand: on_hand), class: 'text-red-500'
-          end
-
-        variant_info =
-          t('.for_variants', count: product.variants.count)
-
-        content_tag :div, safe_join([stock_info, variant_info], ' ')
-      end
+      data: ->(product) { component('products/stock').from_product(product) }
     }
   end
 
@@ -119,7 +126,7 @@ class SolidusAdmin::Products::Index::Component < SolidusAdmin::BaseComponent
     {
       header: :price,
       data: ->(product) do
-        content_tag :div, product.master.display_price.to_html
+        content_tag :div, product.master.display_price&.to_html
       end
     }
   end

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

@@ -1,13 +1,14 @@
 en:
-  product_image: 'Image'
-  add_product: 'Add Product'
-  stock:
-    infinity: '∞'
-    in_stock: '%{on_hand} in stock'
-  for_variants: 'for %{count} variants'
+  image: 'Image'
   batch_actions:
-    delete: 'Delete'
     discontinue: 'Discontinue'
     activate: 'Activate'
   filters:
     with_deleted: Include deleted
+  scopes:
+    all: All
+    available: Available
+    discontinued: Discontinued
+    in_stock: In stock
+    out_of_stock: Out of stock
+    deleted: Deleted

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

@@ -1,19 +1,10 @@
-<div class="px-4 relative" data-controller="<%= stimulus_id %>">
-  <header class="py-6 flex items-center gap-4">
-    <%= render component("ui/button").new(
-      tag: :a,
-      title: t(".back"),
-      icon: "arrow-left-line",
-      scheme: :secondary,
-      href: solidus_admin.products_path
-    ) %>
-    <h1 class="flex items-center gap-2">
-      <span class="body-title"><%= @product.name %></span>
-      <%= render component("products/status").new(product: @product) %>
-    </h1>
-
-    <div class="ml-auto flex gap-2 items-center">
-      <%= render component("feedback").new %>
+<%= page do %>
+  <%= page_header do %>
+    <%= page_header_back(solidus_admin.products_path) %>
+    <%= page_header_title(@product.name) do %>
+      <%= render component("products/status").from_product(@product) %>
+    <% end %>
+    <%= page_header_actions do %>
       <%= render component("ui/button").new(
         tag: :a,
         text: t(".duplicate"),
@@ -29,19 +20,19 @@
         scheme: :ghost
       ) %>
       <%= render component("ui/button").new(tag: :button, text: t(".save"), form: form_id) %>
-    </div>
-  </header>
+    <% end %>
+  <% end %>
 
   <%= form_for @product, url: solidus_admin.product_path(@product), html: { id: form_id } do |f| %>
-    <div class="flex gap-4 items-start pb-4">
-      <div class="justify-center items-start gap-4 flex flex-col w-full">
+    <%= 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) %>
         <% end %>
 
-        <%= render component('ui/panel').new(title: 'SEO', title_hint: 'Search Engine Optimization') do %>
+        <%= 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) %>
@@ -105,35 +96,38 @@
             href: spree.admin_product_product_properties_path(@product)
           ) %>
         <% end %>
-      </div>
+      <% end %>
 
-      <aside class="justify-center items-start gap-4 flex flex-col w-full max-w-sm">
+      <%= page_with_sidebar_aside do %>
         <%= render component('ui/panel').new(title: "Publishing") do %>
-          <%= render component("ui/forms/field").text_field(f, :available_on, tip: t(".hints.available_on_html"), type: :date) %>
-          <%= render component("ui/forms/field").text_field(f, :discontinue_on, tip: t(".hints.discontinue_on_html"), type: :date) %>
+          <%= render component("ui/forms/field").text_field(f, :available_on, hint: t(".available_on_html"), type: :date) %>
+          <%= render component("ui/forms/field").text_field(f, :discontinue_on, hint: t(".discontinue_on_html"), type: :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="body-text-sm"><%= Spree::Product.human_attribute_name :promotionable %></span>
-            <%= render component("ui/toggletip").new(
-              text: t(".hints.promotionable_html"),
-              position: :left
-            ) %>
+            <span class="font-normal text-xs"><%= Spree::Product.human_attribute_name :promotionable %></span>
+            <%= render component("ui/toggletip").new(text: t(".hints.promotionable_html")) %>
           </label>
         <% 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) %>
+          <%= 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
+          ) %>
         <% end %>
-      </aside>
-    </div>
+      <% end %>
+    <% end %>
   <% end %>
 
-  <div class="mt-4 py-4 px-2 pb-8 border-t border-gray-100 flex">
-    <div class="flex gap-2 grow">
+  <%= page_footer do %>
+    <%= page_footer_actions do %>
       <%= form_for @product, url: solidus_admin.product_path(@product), method: :delete do %>
         <%= render component("ui/button").new(
           tag: :button,
@@ -143,7 +137,7 @@
           "data-#{stimulus_id}-message-param": t(".delete_confirmation"),
         ) %>
       <% end %>
-    </div>
+    <% end %>
     <%= render component("ui/button").new(tag: :button, text: t(".save"), form: form_id) %>
-  </div>
-</div>
+  <% end %>
+<% end %>

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SolidusAdmin::Products::Show::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
   def initialize(product:)
     @product = product
   end

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

@@ -9,9 +9,9 @@ en:
   manage_properties: "Manage product specifications"
   manage_stock: "Manage stock"
   delete_confirmation: "Are you sure you want to delete this product?"
+  available_on_html: 'Product availability starts from the set date.<br> Empty date indicates no availability.'
+  discontinue_on_html: 'Product availability ends from the set date.<br> Empty date indicates continuous availability.'
   hints:
-    available_on_html: This sets the availability date for the product. If this value is not set, or it is set to a date in the future, then the product is not available on the storefront.
-    discontinue_on_html: This sets the discontinue date for the product. If this value is set to a date, then the product is not available on the storefront from that day on anymore.
-    promotionable_html: 'This determines whether or not promotions can apply to this product.<br>Default: Checked'
-    shipping_category_html: 'This determines what kind of shipping this product requires.<br> Default: Default'
-    tax_category_html: 'This determines what kind of taxation is applied to this product.<br> Default: %{default_tax_category}'
+    promotionable_html: Promotions can apply to this product
+    shipping_category_html: Manage Shipping in Settings
+    tax_category_html: Manage Taxes in Settings

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

@@ -1,31 +1,33 @@
 # frozen_string_literal: true
 
 class SolidusAdmin::Products::Status::Component < SolidusAdmin::BaseComponent
-  COLORS = {
+  STATUSES = {
     available: :green,
-    discontinued: :red
+    discontinued: :yellow,
+    deleted: :red,
   }.freeze
 
-  # @param product [Spree::Product]
-  def initialize(product:)
-    @product = product
+  def self.from_product(product)
+    status =
+      if product.deleted?
+        :deleted
+      elsif product.discontinued?
+        :discontinued
+      else
+        :available
+      end
+
+    new(status: status)
+  end
+
+  def initialize(status:)
+    @status = status
   end
 
   def call
     render component('ui/badge').new(
-      name: t(".#{status}"),
-      color: COLORS.fetch(status)
+      name: t(".#{@status}"),
+      color: STATUSES.fetch(@status)
     )
   end
-
-  # @return [Symbol]
-  #   :available when the product is available
-  #   :discontinued when the product is not available
-  def status
-    if @product.available?
-      :available
-    else
-      :discontinued
-    end
-  end
 end

data/app/components/solidus_admin/products/status/component.yml

@@ -1,3 +1,4 @@
 en:
   available: 'Available'
   discontinued: 'Discontinued'
+  deleted: 'Deleted'

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Products::Stock::Component < SolidusAdmin::BaseComponent
+  def self.from_product(product)
+    new(
+      on_hand: product.total_on_hand,
+      variants_count: product.variants.count,
+    )
+  end
+
+  def self.from_variant(variant)
+    new(
+      on_hand: variant.total_on_hand,
+      variants_count: nil,
+    )
+  end
+
+  def initialize(on_hand:, variants_count:)
+    @on_hand = on_hand
+    @variants_count = variants_count
+  end
+
+  def call
+    stock_info =
+      case @on_hand
+      when Float::INFINITY
+        tag.span t('.stock.in_stock', on_hand: t('.stock.infinity')), class: 'text-forest'
+      when 1..Float::INFINITY
+        tag.span t('.stock.in_stock', on_hand: @on_hand), class: 'text-forest'
+      else
+        tag.span t('.stock.in_stock', on_hand: @on_hand), class: 'text-red-500'
+      end
+
+    variant_info = t('.for_variants', count: @variants_count) if @variants_count
+
+    tag.span safe_join([stock_info, variant_info], ' ')
+  end
+end

data/app/components/solidus_admin/products/stock/component.yml

@@ -0,0 +1,5 @@
+en:
+  stock:
+    infinity: '∞'
+    in_stock: '%{on_hand} in stock'
+  for_variants: 'for %{count} variants'

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pages::Index::Component
+  def model_class
+    Spree::PromotionCategory
+  end
+
+  def row_url(promotion_category)
+    spree.edit_admin_promotion_category_path(promotion_category)
+  end
+
+  def page_actions
+    render component("ui/button").new(
+      tag: :a,
+      text: t('.add'),
+      href: spree.new_admin_promotion_category_path,
+      icon: "add-line",
+    )
+  end
+
+  def batch_actions
+    [
+      {
+        display_name: t('.batch_actions.delete'),
+        action: solidus_admin.promotion_categories_path,
+        method: :delete,
+        icon: 'delete-bin-7-line',
+      },
+    ]
+  end
+
+  def columns
+    [
+      name_column,
+      code_column,
+    ]
+  end
+
+  def name_column
+    {
+      header: :name,
+      data: ->(promotion_category) do
+        content_tag :div, promotion_category.name
+      end
+    }
+  end
+
+  def code_column
+    {
+      header: :code,
+      data: ->(promotion_category) do
+        content_tag :div, promotion_category.code
+      end
+    }
+  end
+end